shell: Remove gdk_screen property/getter

It's used nowhere.

diff --git a/js/ui/modalDialog.js b/js/ui/modalDialog.js
index 0e66e032a28f9daeff0fa65f3683cd1e95a15ece..a28c3cd2d17c989db41c203d24dad38dab661398 100644 (file)
--- a/js/ui/modalDialog.js
+++ b/js/ui/modalDialog.js
@@ -215,7 +215,7 @@ var ModalDialog = new Lang.Class({
         else
             this._savedKeyFocus = null;
         Main.popModal(this._group, timestamp);
-        global.gdk_screen.get_display().sync();
+        Gdk.Display.get_default().sync();
         this._hasModal = false;
 
         if (!this._shellReactive)

diff --git a/src/shell-global.c b/src/shell-global.c
index 19cdc316a9fd9481dc9ca079e58cd417816d2009..6eee3756b4c89c402394c371e502837679cf1fa0 100644 (file)
--- a/src/shell-global.c
+++ b/src/shell-global.c
@@ -63,7 +63,6 @@ struct _ShellGlobal {
   GdkDisplay *gdk_display;
   Display *xdisplay;
   MetaScreen *meta_screen;
-  GdkScreen *gdk_screen;
 
   char *session_mode;
 
@@ -98,7 +97,6 @@ enum {
 
   PROP_SESSION_MODE,
   PROP_SCREEN,
-  PROP_GDK_SCREEN,
   PROP_DISPLAY,
   PROP_SCREEN_WIDTH,
   PROP_SCREEN_HEIGHT,
@@ -168,9 +166,6 @@ shell_global_get_property(GObject         *object,
     case PROP_SCREEN:
       g_value_set_object (value, global->meta_screen);
       break;
-    case PROP_GDK_SCREEN:
-      g_value_set_object (value, global->gdk_screen);
-      break;
     case PROP_DISPLAY:
       g_value_set_object (value, global->meta_display);
       break;
@@ -379,14 +374,6 @@ shell_global_class_init (ShellGlobalClass *klass)
                                                         META_TYPE_SCREEN,
                                                         G_PARAM_READABLE));
 
-  g_object_class_install_property (gobject_class,
-                                   PROP_GDK_SCREEN,
-                                   g_param_spec_object ("gdk-screen",
-                                                        "GdkScreen",
-                                                        "Gdk screen object for the shell",
-                                                        GDK_TYPE_SCREEN,
-                                                        G_PARAM_READABLE));
-
   g_object_class_install_property (gobject_class,
                                    PROP_SCREEN_WIDTH,
                                    g_param_spec_int ("screen-width",
@@ -695,19 +682,6 @@ shell_global_get_screen (ShellGlobal  *global)
   return global->meta_screen;
 }
 
-/**
- * shell_global_get_gdk_screen:
- *
- * Return value: (transfer none): Gdk screen object for the shell
- */
-GdkScreen *
-shell_global_get_gdk_screen (ShellGlobal *global)
-{
-  g_return_val_if_fail (SHELL_IS_GLOBAL (global), NULL);
-
-  return global->gdk_screen;
-}
-
 /**
  * shell_global_get_display:
  *
@@ -881,8 +855,6 @@ _shell_global_set_plugin (ShellGlobal *global,
   global->xdisplay = meta_display_get_xdisplay (global->meta_display);
 
   global->gdk_display = gdk_x11_lookup_xdisplay (global->xdisplay);
-  global->gdk_screen = gdk_display_get_screen (global->gdk_display,
-                                               meta_screen_get_screen_number (global->meta_screen));
 
   global->stage = CLUTTER_STAGE (meta_get_stage_for_screen (global->meta_screen));
 

diff --git a/src/shell-global.h b/src/shell-global.h
index 47c441553cf5b2a90fe67cfbf35be715beed177e..82756f8ba37f53047abb93e22eb447fe919e7ac3 100644 (file)
--- a/src/shell-global.h
+++ b/src/shell-global.h
@@ -17,7 +17,6 @@ ShellGlobal   *shell_global_get                       (void);
 
 ClutterStage  *shell_global_get_stage                 (ShellGlobal *global);
 MetaScreen    *shell_global_get_screen                (ShellGlobal *global);
-GdkScreen     *shell_global_get_gdk_screen            (ShellGlobal *global);
 MetaDisplay   *shell_global_get_display               (ShellGlobal *global);
 GList         *shell_global_get_window_actors         (ShellGlobal *global);
 GSettings     *shell_global_get_settings              (ShellGlobal *global);